Skip to content

Conversation

GuillaumeGomez
Copy link
Member

Fixes #87043.

Instead of completely relying on pulldown-cmark (and its potential changes), I decided to move the generation of codeblocks HTML directly in rustdoc so we can unify the DOM and the CSS classes.

r? @Nemo157

@GuillaumeGomez GuillaumeGomez added T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. A-rustdoc-ui Area: Rustdoc UI (generated HTML) labels Jul 11, 2021
@rust-highfive
Copy link
Contributor

Some changes occurred in HTML/CSS/JS.

cc @GuillaumeGomez

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 11, 2021
@rust-log-analyzer

This comment has been minimized.

@GuillaumeGomez GuillaumeGomez force-pushed the fix-codeblocks-overflow branch 2 times, most recently from 0c8c8d7 to fc8600d Compare July 12, 2021 13:32
@bors
Copy link
Collaborator

bors commented Jul 13, 2021

☔ The latest upstream changes (presumably #87095) made this pull request unmergeable. Please resolve the merge conflicts.

@GuillaumeGomez GuillaumeGomez force-pushed the fix-codeblocks-overflow branch from fc8600d to 09270ed Compare July 13, 2021 08:20
@GuillaumeGomez
Copy link
Member Author

r? @notriddle

@GuillaumeGomez
Copy link
Member Author

@bors: r=notriddle

@bors
Copy link
Collaborator

bors commented Jul 13, 2021

📌 Commit 09270ed has been approved by notriddle

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 13, 2021
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Jul 13, 2021
…low, r=notriddle

Fix codeblocks overflow

Fixes rust-lang#87043.

Instead of completely relying on `pulldown-cmark` (and its potential changes), I decided to move the generation of codeblocks HTML directly in rustdoc so we can unify the DOM and the CSS classes.

r? `@Nemo157`
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Jul 13, 2021
…low, r=notriddle

Fix codeblocks overflow

Fixes rust-lang#87043.

Instead of completely relying on `pulldown-cmark` (and its potential changes), I decided to move the generation of codeblocks HTML directly in rustdoc so we can unify the DOM and the CSS classes.

r? ``@Nemo157``
@bors
Copy link
Collaborator

bors commented Jul 13, 2021

⌛ Testing commit 09270ed with merge b6139eccc1932ed0cacffd743f35795a8d672207...

@rust-log-analyzer

This comment has been minimized.

@bors
Copy link
Collaborator

bors commented Jul 13, 2021

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 13, 2021
@GuillaumeGomez GuillaumeGomez force-pushed the fix-codeblocks-overflow branch from 09270ed to 7593bfe Compare July 14, 2021 10:04
@GuillaumeGomez
Copy link
Member Author

@bors: r=notriddle

@bors
Copy link
Collaborator

bors commented Jul 14, 2021

📌 Commit 7593bfe has been approved by notriddle

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 14, 2021
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 14, 2021
…laumeGomez

Rollup of 6 pull requests

Successful merges:

 - rust-lang#87027 (expand: Support helper attributes for built-in derive macros)
 - rust-lang#87056 (Fix codeblocks overflow)
 - rust-lang#87117 (Shrink the CrateStore dynamic interface.)
 - rust-lang#87120 (rustdoc: Remove unnecessary `extern crate` aliases)
 - rust-lang#87125 (Fix Ayu theme `<code>` color)
 - rust-lang#87130 (Update browser-ui-test package version)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 57e021c into rust-lang:master Jul 14, 2021
@rustbot rustbot added this to the 1.55.0 milestone Jul 14, 2021
@GuillaumeGomez GuillaumeGomez deleted the fix-codeblocks-overflow branch July 14, 2021 21:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-rustdoc-ui Area: Rustdoc UI (generated HTML) S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Rustdoc: long lines are escaping text code blocks
7 participants